Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream1 #15

Open
wants to merge 95 commits into
base: master
Choose a base branch
from
Open

Upstream1 #15

wants to merge 95 commits into from

Conversation

veeramarni
Copy link
Collaborator

No description provided.

veeramarni and others added 30 commits August 9, 2016 19:48
@veeramarni
Initial commit
7ea6232
@veeramarni
first commit
571e5b1
@cdmbase
still have violation but removed duplicate react
f0b8e87
@cdmbase
violation changes
12d8de6
@cdmbase
changes
cd2a823
@cdmbase
resolve double react issue
af03a10
@cdmbase
updated readme
3289731
@cdmbase
Update README.md
78ba4d7
@cdmbase
Update README.md
b0f3535
@cdmbase
Update README.md
25af529
@cdmbase
ignore .idea
4f267f2
@cdmbase
added git login feature
d6b70cf
@cdmbase
split into multiple app
e4e9ee1
@cdmbase
removed app from mainapp
d736c87
@cdmbase
more fixes to react duplication issues
a18900f
@veeramarni
added some arragements
f86d475
@cdmbase
folder modification
0b322a5
@cdmbase
changes
30989b2
@cdmbase
Structured the folders as per standards
b0971a7
@cdmbase
removed autopublish feature and fixed box creation, dashboard
101d60f
@cdmbase
remove bindtracker and replaced with recompose
8df2cad
@cdmbase
fixed autoload of boxes
fcc6c7f
@cdmbase
included terminal and fixed ui
1799614
@cdmbase
added meteor package and fixex xterm issue
c8e3cef
@cdmbase
added new changes
48ade54
@cdmbase
removed mainapp
ba1b8d0
@cdmbase
removed symbolic and private packages
80ecbb8
@cdmbase
Squashed 'app/src/MainApp/' content from commit 97ed81c
e96ce09 
git-subtree-dir: app/src/MainApp
git-subtree-split: 97ed81c76c859180dcd7cff72d2276c287939a4a
@cdmbase
Merge commit 'e96ce09e585aec222ef14cfdfd4931c2e9bb1f21' as 'app/src/M…
ff60f8a 
…ainApp'
@cdmbase
moved server start to router
b38ee7c
cdmbase and others added 30 commits December 25, 2016 13:47
@cdmbase
Squashed 'app/packages/meteor-integration/' content from commit 219b682
31e9d69 
git-subtree-dir: app/packages/meteor-integration
git-subtree-split: 219b68230da3b6f0320fcf6c92acfbe98cdee494
@cdmbase
Merge commit '31e9d69565abbfe456801aceeadf5c0e343ce0f7' as 'app/packa…
908ebe0 
…ges/meteor-integration'
@cdmbase
to fix ssr
7617bc0
@cdmbase
fixed SSR
7c74c7e
@cdmbase
add subscription
d00c2e6
@cdmbase
removed meteor-integration for testing
7d7f5f5
@cdmbase
Squashed 'app/packages/meteor-integration/' content from commit 17848d3
f82c2c0 
git-subtree-dir: app/packages/meteor-integration
git-subtree-split: 17848d30b19cf23dc34451f5367fe09883f6ea8a
@cdmbase
Merge commit 'f82c2c0ad1b4877e1ca468266c8fb60ba0eb78fd' as 'app/packa…
35cedd6 
…ges/meteor-integration'
@cdmbase
removed meteor-integration
be734c5
@cdmbase
Squashed 'app/packages/meteor-integration/' content from commit 219b682
a0f3006 
git-subtree-dir: app/packages/meteor-integration
git-subtree-split: 219b68230da3b6f0320fcf6c92acfbe98cdee494
@cdmbase
Merge commit 'a0f300621af481b50824bad7e864c345679dc472' as 'app/packa…
1846eb9 
…ges/meteor-integration'
@cdmbase
fix to allow meteorClientConfig to be used on the server#56
65204bf
@cdmbase
with apollo subscription
fe75b6f
@cdmbase
updated to use apollo subscription, query only works
eca9f40
@cdmbase
changed to use graphql
e6aac71
@cdmbase
dashboard poll
4ad6607
Stabilization for master
b0060c0
@cdmbase
fixed SSR
4dbaabf
@cdmbase
updated readme
cb1ed95
@cdmbase
Squashed 'app/packages/meteor-react-router-ssr/' changes from b4a8f09…
f0d09fb 
…..532a174

532a174 updated react-router-ssr for meteor 1.4.2

git-subtree-dir: app/packages/meteor-react-router-ssr
git-subtree-split: 532a174a5c3dd6fc018fa223d160f059004224b9
@cdmbase
Merge commit 'f0d09fb63e266704c8abc89d37880b1636ad1dbf'
f214649
@cdmbase
corrected readme
d74193d
@cdmbase
to fix loading props in wrapperHook
0f9faf8
@cdmbase
Merge branch 'master' of https://github.com/cdmbase/AdminIDE
319ae8e
@cdmbase
commit changes on 27th
9bdbb93
@cdmbase
changes
ae90054
@cdmbase
merged commits 27th changes
f4a87f2
@cdmbase
fixed SSR
9064d37
@cdmbase
updated readme
5dae852
@cdmbase
to fix loading props in wrapperHook
fc01428
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@veeramarni @cdmbase